marker handling improved
mapping in the db needs to be tested further