better multi-word tag support