more org refiling tweaks