little changes for tags support