Added ability to filter items that get returned by their type