Fix for: The query part of the URL gets ignored