Fix MPF ID extraction.