commas, because syntax
fix a few things
tweak the query when edfh=1