Finished filter box fixes

Finally!
Merge pull request #1 from patoui/Filter-box-fixes

Finished filter box fixes