Conditional case-insensitive search added