Fixed issue replacing properties with a hint item