Allow searching for non-string arrays
Resolve merge conflicts.