refactor filter name, and ability to filter by connection name