Fixing bug in PhotoService
Revert 9dee474..488c712

This rolls back to commit 9dee4740646e7bf88132a86fa1bee3dbe5247ec5.
Improve PhotoService