upgraded mechanic

I guess we can delete them. I think there's already a way to search with arbitrary predicates.