Fixed bug where no filter is applied