Simplified Search, removed unnecessary design bloat