fix(oracle): Further query fix for oracle

related to CAM-910