Check both full and short name in photo annotations #92