Issue #37: Search enhancements

Addressed most of the issues in #37 except the "hide the carousel" part.