Most lookup values changed to top-level objects; ids for input items in ...

...calculate; aligned fields returned with current data class structure