Added active item boolean
Merge branch 'active_or_inactive_items'