Fix searchfilter issues