cli minor fix
Policies query optimization