More fixes for photo numbering