Merge - terms: make filters togglable
Bug Fix for making filters togglable

The terms panel would lose track of it's filters if multiple term panels and filters were added and removed. This fixes that issue by filtering out on its term type.