fixing bug where columns needed table qualification in some instances.