Reverted merge of filtered search + versioning