Added keywords filter (raw-style)