Fixed sorting controller by location and added sorting by picture