Fixing bug with update event and index
Fixing tags