Removed cyclic dependency between ui and ui.search
Removed old todo
Added documents for sprint-5