#488 updated todo
#488 Optimized serialization in basic search