Removed handling old_slug, improved handling of images.