major refactoring, removed all buoys from search page