AMO ES Search Fixes

This isn't done, but I'll continue to update this as I fix tests. Feel free to review as I go.