Add fallback to look up data when it isn't saved