Add filter type to state_output
Backport #14684 to 2014.7