adding all query key dumping, fixing bugs