Rename Sort to SortCriteria finally and split out find_query helper.