Further work on the goal facility in the rendering layer