Added some additional filtering using a popup type of combo box