Fixed server wide filters + added test