A fix for the search filtering, FEND-843