Move subnet route to point to l2comp and fix bmap usage in agent_path