Be more generous with regex matching
Fix questions to correct type