Working search feature
Changed the search queries a bit to remove redundancy.