Proper fix for the query string forward problem