Added null and undefined handling to highlight filter, closes #123