semanticDatabase improvement for query types