[pg]: added include and exclude for query fields