Quick search

Pull request to merge the QuickSearch feature with master