[support] Converting a query to D7