Made Organization optional to get FacilityParty records for non-orgs (ie going the other direction)