Add more handling of run names with spaces in them