Add case-insensitive search; minor changes