Fixes #30
Fixes #30
Removed broken connection filtering
More work on #26