search\company.class bugfixes
admin/search to new master