default to None, not empty list

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
test for feature instead of type

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>