WIP, some fixed on selects elements