Added language filtering