fix hidden class
fix MockQuery not returning db name consistently
fix state being lost if storage did not appear
fix overflow