StateDevice -> Refactor Ignore code.  Fix a bug that didnt allow to ignore just on source device.