in_monitor_agent supports '@type' and '@id' query

This commit includes tag query fix