[#42842865] moving more values into the reference data dao, and out of the direct mapping. This will simplify the queries and allow us to use the cached reference values