FEAT: preliminary SELECT/OPTION support