Fixed error with search_type.
Merge branch 'raw_search'