search and todo fix