Code cleanup: reduce nesting
Code cleanup: reduce nesting
Code cleanup: remove unused variable
Fixed a typo that resulted in a bug where the list of filtered items wasn't being preserved when the list of filtered tabs was modified