Fixes to store filtering