Added the possibility to query also views defined on the db