fixing filtering