Start fixing issue with boolean in database
Perhaps better to use int instead