Bugfix: ignore question marks in requests
Fix merge bug