rewrited ids to tags. tests updated, sample updated