use expected field names in query
ensure we do not include null valued edd results
update period property accordingly
pep8