fix #1303: use qualified intent keys