EST-279: adjusted regexes for property, unit and lease