Added query param handling