Add indexes and case-insensitive searching