Added another way to populate and handle data

issue: #1148
Added extra code to implement empty key check

Added extra code to implement empty key check.
Needed so that the first item will be the blank one
Updated some more filter component logic

issue: #1148