Fixing QuickSearch Issue