- Fix refresh issue duplicating MPL entries
- MPL code review (fixed some issues and inconsistencies)