Updated Search. Need queries written for search categories.