Fix building FROM-clause