added django filter and enhanced cbv