restored some prior search functionality lost in previous merge