Refactor Data Filters a bit so that the basic entity property filters can be code-generated