adding deactivated policy handling