Resolves #47: replaced search boxes with combo-boxes