Add ability to search by more than just the q field