Remove hidden hf_rpl_type field from top level tree and add it to