Bug fixes and improvements for add_property_filter().  Fixed bug with deleting cross-join.