Fixed #41: resolve() should now work corrent again also with query params