Use new possibility to provide distinct queries