Fixed filter to return all

Filter now returns all. Next step is to filter each of these out by type