update merge to pull in all filter tags