[OTE-308] Update upsert querybuilder and compliance table upsert function

[OTE-308] Update upsert querybuilder and compliance table upsert function #2163