                                    expand-user-query
                                    (convert-to-plan query-rec paging-options)
                                    extract-all-params)
-        sql (-> plan fix-plan-in-expr-multi-comparisons plan->sql)
+        sql (plan->sql plan)
         paged-sql (jdbc/paged-sql sql paging-options)]
     (cond-> {:results-query (apply vector paged-sql params)}
       include_total (assoc :count-query (apply vector (jdbc/count-sql sql) params)))))

              (case (:type cinfo)
                :array
                (map->ArrayRegexExpression {:column cinfo :value value})

                :multi
                (map->RegexExpression {:column (merge cinfo
                                                      (fv-variant :string))
                                       :value value})

                :queryable-json
                (map->JsonbPathBinaryExpression {:operator (keyword "~")

                                         :value (su/array-to-param "timestamp"
                                                                   java.sql.Timestamp
                                                                   (map to-timestamp value))})
                :integer
                (map->InArrayExpression {:column cinfo
                                         :value (su/array-to-param "bigint"
