Update filter to avoid classloader issue