Add fix/hack to the linked problem with extra parameters in the qs.