better querystring support and fix broken signing