Add search and sort caps + minor changes to services