Add wrapper and image count to property images