Added POJOS and fixed empty filter prob.