fix querying with empty parameter
Merge branch 'origin/dev-cortex'