fixing filtering & resources