Fix: find call on store should use singleton name