Made the filters language agnostic