improved query building compatibility
updated readme