! Actually assign the right label to something.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! More PM bug fixes, now at least if you move something into a label it shows you that you moved it. Still more bug fixes required.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1348 from Arantor/release-2.1

Some of the PM bug fixes