Fix for when facility='None' in the url