fix labeller for doubly facetted plots; add swap_ for named dotargs