more fixes to case insensitive search