Results context menu improvements

Resubmit of #462 to the fd5 branch.