Fixed pushState() and revertState() not considering current $charType