More changes to issue #58 filtering different types of elements