rename JQFilter to Filter
fix JoinFilter base case bug