Fix public search breaking with 3 entries by making query objects use strings as keys consistently