more fixes - switch to hashstore