Some fixes for the dashboard id being passed with extra querystring parameters