If part of this refactor is to remove the need for short urls, you probably should expand these.