Fixed more bugs
More fixes (2 tests faiil)
Tracking extended keys/duptables for metrics