Fixed for cases when there are no query params