Refactor query normalization into core query jumbling

Refactor query normalization into core query jumbling

Edit