Cosmetic code changes

Upgrade also resets ignore case parameter