First version of search screen and some result corrections