Consolidate photo display checking to one function.
Fix test as M tokens now not deleted.