Fix: issue with some discovery rules with mutli-keys