Fix potential issues lying data&property IDs and add tag&property manipulations