BACKLOG-3945 : fixed getProperty(), simplified iterator