Filter model tweaks based on PR suggestions