Still more changes for taglist