[#2619] Tweaks for new proxy/lazy services entry