change store strategy to be more verbose and more flexible about how to query items