Added more columns also to the search