Store & Query Fixes