Search query now searches on terms