Reinclude BT name filtering
Add filter check when adding to map