Make value a textfield
Select box for matches
Merge branch 'master' into develop