 					dc_code,
 					dc_name,
 					pr_name,
-					total AS pop_size,
-					total * pop_c / pop_y AS pop_curr,
+					pop_size,
+					pop_curr,
 					lz_code,
-					'drought' AS lz_affected
+					lz_affected
 				FROM
 					zaf.prob_hazard AS k,
 					(

			pr_name,
			pop_size,
			pop_curr,
			lz_code,
			lz_abbrev,
			lz_name,
			wg_name,
			pc_wg,
			hh_size,
			s.lz_affected,
			wg_affected,
			pc_wg_affected,
			threshold,

						f.dc_mdb_code = g.dc_mdb_code
					AND
						g.dc_code = i.dc_code
					AND
						gid NOT IN (
							SELECT
								k.gid
							FROM
								zaf.demog_sas AS k,
								zaf.prob_hazard AS m
							WHERE
								ST_Intersects(k.the_geom, m.the_geom)
							)
				) AS j
		ON
				n.lz_code = j.lz_code
			AND
				n.lz_affected = j.lz_affected
;

--COMMIT;
