Improving UI and queries see BT#7297