moved facility name validation up