clearup logic and cater to the exclusionary case

Enyo-DCO-1.1-Signed-Off-By: Cole Davis (cole.davis@lge.com)