Added filter by scope to export