Switching to exact query spec