Added filter for active equipment only