Added should highlight property for rows
changed atomicity of some properties