Add highlighting to filters
Remove gibbon