The solution for BATCH-2079 was too agressive in that it removed table references from columns in places that ended up in where clauses. Since SQL does not support the use of column aliases in where clauses, the table references are needed. This fix should address adding the aliases back where needed, while keeping them out in the windowing paging query use cases where they were problematic. BATCH-2360