SERVER-12321 fully normalize in canonical query