Clean up complexity in concat_items (previously concat_options) method
update tests to cover selecting multiple terms
update .pot line numbers