Hola. Please check the wiki to choose the best key/value for your improvements. Do not put all information in the 'name' field. That will be readable (to humans), but not usable by software. landuse=grass, named Orchard isn't an 'orchard'. ;-)
Same for lagoons and reservoirs. 
But thanks for adding first hand information.
Have you considered StreetComplete? It also helps placing pictures associated with notes.