fixes sort order
merge conflcts in photos.py