clean up structure a little and integrate filter into simple discovery task