us65 
- Moved search functionality into search controller
- Removed obsolete methods