- Patch query spec to work with 3.2, 4.0 and 4.1