Starting to move Query filter and join definition away from strings and more toward data structures which are easier to modify later down the line.  Now services can filter by many-to-many relationships.