INTO fixed
filtering added