moved source facility throw out of the iterator loop
provided a robust enrichment funciton for the facility