Update locations-model to inherit from DataModel
 fr

Update locations-model to inherit from DataModel and minor bug fix