Reverted the last change. Adding an alternative search using BO service.