add query test
fix inserting in map