- further query-optimization implementation