Fixes
Added query capabilities