Add hacky history updates and fix URI decoding.