fixes in search
move comments to first screen