Improve virtual marker handling