demographics match improvements (and common directives)