Water security in PH better, but affordability still an issu