Improved choices functions to always return correct type

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Refactor

select and checkbox fields

Signed-off-by: Elliot Condon <e@elliotcondon.com>