Bug fix for numbers
Add helper for checkbox