Added ability for dbHashQueryTree maps to have single/plural and mapping field