public marks

PUBLIC MARKS from asteroza with tags update & mapping