CON-175: fix issue with creatiion of Tags with null values