Made store interface handle find_one cases better