motified TODO
search bug fixed