added filter for all/complete