Further fix for searching with custom fields