I had a custom POI search for Drinking Water saved, and it used to work fine. Now it doesn't find anything. Digging deeper, things seem odd. Here's a Drinking Water point in SE England that I know:

Current OsmAnd+ from Google Play, current map, Touring view configured with Hide>POI Icons disabled, we can see the Drinking Water POI icon on the map.The details say it is "Man Made", but in the custom POI search categories it is not there, but under "Food". If I do a POI search for "Drinking Water" it is not found. If I do a custom POI search and pick "Drinking Water" under "Food" it is not found (not listed, not highlighted on the map). If I pick the entire category "Food" or "Man Made", it still isn't highlighted on the map.It's not just this one Drinking Water POI, it's not finding anything within a large radius.
If I do this kind of activity with another POI (eg Railway Station) I have no problems. And I have searched for Drinking Water like this within the last year without difficulty.
My example POI is quite richly tagged on OSM, but OsmAnd similarly fails to find nearby Drinking Water with only the amenity=drinking_water tag (still displayed as a POI icon with details "Man Made"). And it's not that the POIs have been edited on OSM recently.
Could there be a problem with the current map, or am I missing something?
Thanks for any input!