BUG-FIX When no properties in string
BUG-FIX When no property in scope
Better test coverage