cleaned up search, brought savePoint_nosql stuff back into lib