Per Chris' suggestion, get rid of the select canonicalization and just add