Fix up device filter #62