In order to improve water storage analysis, please implement an Overlay type BUILDING_LAST_STORAGE, containing the water storage per grid cell, which can be accessed through TQL.

More info:

https://previewsupport.tygron.com/wiki/Building_last_storage_result_type_(Water_Overlay)