Enable ES on prod3
Stop using deprecated includes with with_items
Merge branch 'search'