public marks

PUBLIC MARKS from asteroza with tags conversion & gateway