[FEATURE] move configuration of returnRawQueryResult