More query param name fixes.