added proper filters