continued work on search feature, to be continued