renamed query-base to structured-query