Handle encoded URLs better