Issue #1650 - testing for prefix/suffix being set or just photo