match new filter-less agent model
add some diagnostic logging to try to chase down corrupted store issue on device