custom fields modified and search is refactored #420 and #430