Filter component update

Added the functionality to also send in a HashMap that will allow the criteria to be
different from the list value.

Also added some code to set the criteria value for the empty entry if any is used.

issue: #1148