Handle AS in joins
Handle AS in FROM clause
Fix minor bug

When there are 2 tables in FROM