Rewritten the way the Page URL is composed in case no Query Parameter is provided (no pointless trailing '?' when no Query Parameters are provided)