Custom search attributes lost after 1.19 -> 1.20

The above was not the fix.

Actual fix: