better marker handling