Improved Search & Bug fixes