Improving queries see BT#7297