TAP5-2100: Fixed Zone-refresh component using wrong context on refresh