Handle missing text in sane fashion
Improve pushState behavior