+ [OE-4350] use service layer for some admin functions, bugfixes