Fix schema building
Fix building FROM-clause