Improved URL normalising