Fixing querying and improving readme