fix(Fix:multiple-query): Refactor functions to handle multiple queries in a single operation

fix(Fix:multiple-query): Refactor functions to handle multiple queries in a single operation #9