Fixing the Id issues when open multiple tabs

This pull have the fix for Id issues when multiple tabs are active.