added filter on type to skip STARTUP elements + IMPACTING code refactoring