This commit addresses the problems described in the first screen shot related to the filters drop down