METAMODEL-74: Fixed issue with blank values