added highlighters, fixed server side custom filtering