Avoid conflicts of finish button and form elements with name 'finish'
Merge branch 'master' into options
Different approacht to filtering bound options

Which doesn't filter current option selection.