Made store interface handle find_one cases a bit better