work propertyId back in as source