Search, branding and some refactoring