Fix case with no query params