Agreed, I'd be happy to do that. I'm wanting to do another PR where we do the same thing for search (if a formula lookup fails then do a search and try and find it).