Updates for latest ShortUrl support
Shave a few milliseconds off the UrlFilter
Remove term that does not need to be reserved