PrimarySearch: Fix queries for keyphrase clues