a fix to the VIVO-833 fix....
template fix to prevent exception when label is null
fix datagetter that was causing a query parse exception
Merge branch 'develop' into feature/tdbContent