Fix up device filter #61