Adding new filters
Updates to UI
use 2.0.3 & remove affix
Merge