Include National Executive positions in person positions

Closes #865