Use find(...) instead of filter(...).next()

Use find(...) instead of filter(...).next() #599