replace fake dropdown by <select>

(cherry picked from commit 530abe277eef5cb8f7f1a1352bde16ca8b27747a)

remove forgotten code

(cherry picked from commit b95d637c4fcb0e1898fc6622262f7fbe92457e67)