Fixed filtering if no filter is seted