Restore Refine Search and shorted "equivalent limiter" clauses