Fix search_option methods