Fixed bug: switching to PM from PM would remove ID
New ScreenShot