More robust handling of custom questions