Update property_filter and fix elements as needed