The dataset would also need the server name you are reporting on. That's an interesting modification. I'm not sure you'll be able to make both the report and the data source dynamic.