more clean up of interaction between o2-web and o2-portal