improved monitoring_hint handling