Tag: performance improvement and bug fixes