Improved column checks when validating queries. refs #452