Only remove tabs for items when the tab is found

Closes #96