Updated filter function and ger definitions