DC21-457: Fix facility ordering in dropdowns