make sue we remove querystring from name