Fix layout of search items
Merge branch '161-list-variables-on-search' into next