Fix user select and related in pm plugin