MOB-131: Updated from Final Filters List
MOB-131: Minor tweaks