Added new query format (keyword, location)