Minor refactor of features.find()