Fixing search classes and defaults