Fixed Location sort after removal of locationmodel