cleaned up persons and completed missing mappings for facilities