Updating logic for checkboxes and filters
Merge branch 'master' of github.com:a-suarez/vSafe