+ @mnandri - fixing rapidsms locations model