TRUNK-2999 Tweaked queries to do AND for similar words