Fix Service Gateway to handle timeout parameter as query string parameter