Added query params stuff to auto canonical url generation