added preloader
separated filter into two