replaced old search widget with new one
Merge branch 'APD-86-BAG-2' into develop