upd MapService and minor