Clean-up from experiments and deprecated firstMatching() method - use filter(...).take(1) instead.