Fix double search box issue.
Kill finished todo.