Fixed issue with datasources with names in spaces