more work on search mostly