[ca] Improved disambiguation. Fixed false alarms