correct string hanlding with building custom property label
(cherry picked from commit 6a519e5eefb5042ca47fcfb769d2cd8d6c890970)