Advanced Filter Upgrade

gtocore:shapeless/advanced_filter_upgrade