added custom fields to search
Merge branch 'search'