! Fix property values containing ":"
! Enhancements and fixes