include more checks
do not include null values in calculated dataset
fix positional parameters for string
remove query not in QA definition
calculate with end of period as stated in QA definition