Removed query support
Minor changes