3.0: fix for custom moh
3.0: fix reorder when authz enabled