added filter by fix