fix drifting layer to use distinct and log and use concatMap till flatMap gets fixed