query interface improved