move form select elements to separate select key, #421