Page composer uses quite frequently the wrong Hst Model

The hst page composer runs in the platform webapp. There is code like

HstServices.getComponentManager()

and code like

VirtualHosts 
 model = requestContext.getResolvedMount().getMount().getVirtualHost().getVirtualHosts()

however the above gives the 'model' of the platform webapp while in general the model of the webapp that is being modified in the channel mgr should be used!