Move BatchlogEndpointSelector to BatchlogManager.EndpointFilter + minor refactorings