started fixing filtering (broke when implementing routing