Fixes #386
Merge + Fixes #370
form-select cleanup