Improve offline marker behaviour.