Adding advanced search see BT#7708