comments and search bug fixed