Fix logic determining whether to grab photo_url

Supports #218