Improve number questions, handle according to regex