GAIAEH-265 multi facility support improved