Fixed id tags [MJ-322]