Several improvements to MergeWP