Returned object instead of array to be consistent between searcher and proxy.
Merge branch 'develop'