fixed merge problems and case-insensitive search