+ Beautify the code
+ Fix double-encoding issue (Bug 60526 - Apostrophes in URL titles causing problems)