Multiple select fixes (#37)