|#1157|| using facilityTypeCode instead of name in query, code cleanup, warnings removed