- Updated search behavior 
- Bug fixes