fix bug: inputs not handled in some cases

Was using just filtered inputs if available, should always use
unfiltered ones too.