Add NDS filtering
Only revise singletons