Added functionality to turn answering/search function off
Added more TODO