Improve case sensitive search