Fix: Include Query Parameters from current URL in new URL