Enemy Cycling while in combat not working?

Hey I have my target cycling option for "when weapon is unsheathed" set to "Enemies" but this has not been working properly for me since the 2.1 update. The issue only seems to occur while I\\\\\\'m in combat. Out of combat it works fine. The issue is that it is cycling through other targets as well as enemies. I messed around in settings for a while trying to fix it but nothing has worked so far.

I use an xbox controller on pc and thus far pressing right or left on the d-pad has worked until the update. Wondering if anyone has this problem as well or knows if its a known bug and being worked on.