advanced search - fieldsets moved to separate files, fix import