store_filter fixes