Fixed Upper case text issues