comments and literals search fix