Small refinement to the GUI + fix for filterBuilder check