Fix for query parameters breaking routing