CEP-431 rewrite multiple search terms for better match