Item redirects

Cleaning up after the item redirects work.

Removing the switch and fixing a small bug that happens when a hort url shows up on the wrong server,