db changes to support multiple db-queries