Minor fixes on search filters, missing from last commit