Fix parsing, given new tags