Replaced all uses of criteria with filter in public APIs