Also save the photo tags

Cleaned up the code as well.