Fix search and sort opts