Minor tweaks to expected filters functionality