further improve case-insensitivity