{FIX] use clustered query in query facade