Making better use of Knowckout features
Fixing query