Wild-card issue partially solved