Fixed filtering and added object details