refactor finding as array or object, pluck
Merge origin/master