Fix broken quick search
Refactor menu to dynamically add and remove sub entries.