Fix broken internal targets and keepalive (with signal conflict)
refactor waitinfo page management (send update info to proxy for waitinfo page only when needed)