Added better filters, upgraded django