Merge improvements to filterdns daemon