Revert "Allow search query to be passed in options hash"

This reverts commit 8e846e1d2d0db40fc24db3247b4e239a30bf0760.
Fix enumerable search interface