Added DSQL Filtering Data + corrections