changed query-base to structured-query