Fixing minor errors and adding better support for custom queris