Friends' photos are returned as well as photos from the place

Friends' photos are placed on top of the general photos

Photo screen does not adhere to new rules