fix leading dash, missing IDs