Add insensitive case search and CONTAINS