add '?' (0..1) support