Modified current_url function to have parameter to include query string parameters