Re #221: Fixes for EDM places and no pagination of single image.