refs #9455. Refactor to separate processing.

Refactor to separate out unfiltered from filtered processing. Code
duplication still needs to be addressed.