Reduced the likelihood of duplicate JOIN aliases.  Started work on query conditions (which will replace filters.)