Fixing issue with combined model + query language.  Names now translate from the model field map.