Support filtering by dimension enum values

[RickMoynihan]

Following issue #41 which will free up the names and and or from the schemas we should put and and or back but use them exclusively throughout the schema where we filter by ENUMs.