partially solved propertyId issue, though needs routing fix