Store subquery alias in tables data (will be useful to group tables by subquery belonging)
Fix some query samples