GUI-337: Add choices for condition keys and operators