Merge pull request metabase#5836 from metabase/fix-nqf-issues

New question flow fixes

frontend/src/metabase/containers/EntitySearch.jsx

@@ -109,7 +109,10 @@ export default class EntitySearch extends Component {
 
     setSearchText = (searchText) => {
         this.setState({ searchText }, this.applyFiltersAfterFilterChange)
-        this.updateUrl((currentOptions) => ({ ...currentOptions, search: searchText}))
+        this.updateUrl((currentOptions) => searchText !== ""
+            ? ({ ...currentOptions, search: searchText})
+            : _.omit(currentOptions, 'search')
+        )
     }
 
     resetSearchText = () => {

frontend/src/metabase/new_query/containers/MetricSearch.jsx

@@ -62,7 +62,8 @@ export default class MetricSearch extends Component {
             <LoadingAndErrorWrapper loading={isLoading}>
                 {() => {
                     const sortedActiveMetrics = _.chain(metadata.metricsList())
-                        .filter((metric) => metric.isActive())
+                        // Metric shouldn't be retired and it should refer to an existing table
+                        .filter((metric) => metric.isActive() && metric.table)
                         .sortBy(({name}) => name.toLowerCase())
                         .value()
 

frontend/src/metabase/new_query/containers/SegmentSearch.jsx

@@ -67,7 +67,8 @@ export default class SegmentSearch extends Component {
                     // all segments (also retired ones) and they are missing both `is_active` and `creator` props. Currently this
                     // filters them out but we should definitely update the endpoints in the upcoming metadata API refactoring.
                     const sortedActiveSegments = _.chain(metadata.segmentsList())
-                        .filter((segment) => segment.isActive())
+                        // Segment shouldn't be retired and it should refer to an existing table
+                        .filter((segment) => segment.isActive() && segment.table)
                         .sortBy(({name}) => name.toLowerCase())
                         .value()