diff --git a/shell/modules/cliformat.py b/shell/modules/cliformat.py
index 204de7c8f6..66f926c03b 100644
--- a/shell/modules/cliformat.py
+++ b/shell/modules/cliformat.py
@@ -1,299 +1,304 @@
 # Copyright (C) 2008 Dejan Muhamedagic <dmuhamedagic@suse.de>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
 # version 2 of the License, or (at your option) any later version.
 # 
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
 from vars import Vars
 from clidisplay import CliDisplay
 from xmlutil import *
 from utils import *
 from msg import *
 
 #
 # CLI format generation utilities (from XML)
 #
 def cli_format(pl,format):
     if format > 0:
         return ' \\\n\t'.join(pl)
     else:
         return ' '.join(pl)
 def cli_operations(node,format = 1):
     l = []
     node_id = node.getAttribute("id")
     s = ''
     if node_id:
         s = '$id="%s"' % node_id
     idref = node.getAttribute("id-ref")
     if idref:
         s = '%s $id-ref="%s"' % (s,idref)
     if s:
         l.append("%s %s" % (cli_display.keyword("operations"),s))
     for c in node.childNodes:
         if is_element(c) and c.tagName == "op":
             l.append(cli_op(c))
     return cli_format(l,format)
 def nvpair_format(n,v):
     return v == None and cli_display.attr_name(n) \
         or '%s="%s"'%(cli_display.attr_name(n),cli_display.attr_value(v))
 def cli_pairs(pl):
     'Return a string of name="value" pairs (passed in a list of pairs).'
     l = []
     for n,v in pl:
         l.append(nvpair_format(n,v))
     return ' '.join(l)
 
 def nvpairs2list(node, add_id = False):
     '''
     Convert nvpairs to a list of pairs.
     The id attribute is normally skipped, since they tend to be
     long and therefore obscure the relevant content. For some
     elements, however, they are included (e.g. properties).
     '''
     pl = []
     # if there's id-ref, there can be then _only_ id-ref
     value = node.getAttribute("id-ref")
     if value:
         pl.append(["$id-ref",value])
         return pl
     if add_id or \
             (not node.childNodes and len(node.attributes) == 1):
         value = node.getAttribute("id")
         if value:
             pl.append(["$id",value])
     for c in node.childNodes:
         if not is_element(c):
             continue
         if c.tagName == "attributes":
             pl = nvpairs2list(c)
         elif c.tagName != "nvpair":
             node_debug("expected nvpair got", c)
             continue
         name = c.getAttribute("name")
         if "value" in c.attributes.keys():
             value = c.getAttribute("value")
         else:
             value = None
         pl.append([name,value])
     return pl
 
 def op2list(node):
     pl = []
     action = ""
     for name in node.attributes.keys():
         if name == "name":
             action = node.getAttribute(name)
         elif name != "id": # skip the id
             pl.append([name,node.getAttribute(name)])
     if not action:
         common_err("op is invalid (no name)")
     return action,pl
 def op_instattr(node):
     pl = []
     for c in node.childNodes:
         if not is_element(c):
             continue
         if c.tagName != "instance_attributes":
             common_err("only instance_attributes are supported in operations")
         else:
             pl += nvpairs2list(c)
     return pl
 def cli_op(node):
     action,pl = op2list(node)
     if not action:
         return ""
     pl += op_instattr(node)
     return "%s %s %s" % (cli_display.keyword("op"),action,cli_pairs(pl))
 def date_exp2cli(node):
     l = []
     operation = node.getAttribute("operation")
     l.append(cli_display.keyword("date"))
     l.append(cli_display.keyword(operation))
     if operation in olist(vars.simple_date_ops):
         value = node.getAttribute(keyword_cmp(operation,'lt') and "end" or "start")
         l.append('"%s"' % cli_display.attr_value(value))
     else:
         if operation == 'in_range':
             for name in vars.in_range_attrs:
                 v = node.getAttribute(name)
                 if v:
                     l.append(nvpair_format(name,v))
         for c in node.childNodes:
             if is_element(c) and c.tagName in ("duration","date_spec"):
                 pl = []
                 for name in c.attributes.keys():
                     if name != "id":
                         pl.append([name,c.getAttribute(name)])
                 l.append(cli_pairs(pl))
     return ' '.join(l)
 def binary_op_format(op):
     l = op.split(':')
     if len(l) == 2:
         return "%s:%s" % (l[0], cli_display.keyword(l[1]))
     else:
         return cli_display.keyword(op)
 def exp2cli(node):
     operation = node.getAttribute("operation")
     type = node.getAttribute("type")
     if type:
         operation = "%s:%s" % (type, operation)
     attribute = node.getAttribute("attribute")
     value = node.getAttribute("value")
     if not value:
         return "%s %s" % (binary_op_format(operation),attribute)
     else:
         return "%s %s %s" % (attribute,binary_op_format(operation),value)
 def get_score(node):
     score = node.getAttribute("score")
     if not score:
         score = node.getAttribute("score-attribute")
     else:
         if score.find("INFINITY") >= 0:
             score = score.replace("INFINITY","inf")
     return score + ":"
 def cli_rule(node):
     s = []
     node_id = node.getAttribute("id")
     if node_id:
         s.append('$id="%s"' % node_id)
     else:
         idref = node.getAttribute("id-ref")
         if idref:
             return '$id-ref="%s"' % idref
     rsc_role = node.getAttribute("role")
     if rsc_role:
         s.append('$role="%s"' % rsc_role)
     s.append(cli_display.score(get_score(node)))
     bool_op = node.getAttribute("boolean-op")
     if not bool_op:
         bool_op = "and"
     exp = []
     for c in node.childNodes:
         if not is_element(c):
             continue
         if c.tagName == "date_expression":
             exp.append(date_exp2cli(c))
         elif c.tagName == "expression":
             exp.append(exp2cli(c))
     expression = (" %s "%cli_display.keyword(bool_op)).join(exp)
     return "%s %s" % (' '.join(s),expression)
 def cli_add_description(node,l):
     desc = node.getAttribute("description")
     if desc:
         l.append(nvpair_format("description",desc))
 
 def mkrscrole(node,n):
     rsc = cli_display.rscref(node.getAttribute(n))
     rsc_role = node.getAttribute(n + "-role")
     rsc_instance = node.getAttribute(n + "-instance")
     if rsc_role:
         return "%s:%s"%(rsc,rsc_role)
     elif rsc_instance:
         return "%s:%s"%(rsc,rsc_instance)
     else:
         return rsc
 def mkrscaction(node,n):
     rsc = cli_display.rscref(node.getAttribute(n))
     rsc_action = node.getAttribute(n + "-action")
     rsc_instance = node.getAttribute(n + "-instance")
     if rsc_action:
         return "%s:%s"%(rsc,rsc_action)
     elif rsc_instance:
         return "%s:%s"%(rsc,rsc_instance)
     else:
         return rsc
 def rsc_set_constraint(node,obj_type):
     col = []
     cnt = 0
     for n in node.getElementsByTagName("resource_set"):
         sequential = True
         if n.getAttribute("sequential") == "false":
             sequential = False
         if not sequential:
             col.append("(")
         role = n.getAttribute("role")
         action = n.getAttribute("action")
         for r in n.getElementsByTagName("resource_ref"):
             rsc = cli_display.rscref(r.getAttribute("id"))
             q = (obj_type == "colocation") and role or action
             col.append(q and "%s:%s"%(rsc,q) or rsc)
             cnt += 1
         if not sequential:
             col.append(")")
     if cnt <= 2: # a degenerate thingie
         col.insert(0,"_rsc_set_")
     return col
 def two_rsc_constraint(node,obj_type):
     col = []
     if obj_type == "colocation":
         col.append(mkrscrole(node,"rsc"))
         col.append(mkrscrole(node,"with-rsc"))
     else:
         col.append(mkrscaction(node,"first"))
         col.append(mkrscaction(node,"then"))
     return col
 
+# this pre (or post)-processing is oversimplified
+# but it will do for now
+# (a shortcut with more than one placeholder in a single expansion
+# cannot have more than one expansion)
+# ("...'@@'...'@@'...","...") <- that won't work
 def build_exp_re(exp_l):
     return [x.replace(r'@@',r'([a-zA-Z_][a-zA-Z0-9_.-]*)') for x in exp_l]
 def match_acl_shortcut(xpath,re_l):
     import re
     for i in range(len(re_l)):
         s = ''.join(re_l[0:i+1])
         r = re.match(s + r"$",xpath)
         if r:
-            return (True,r.groups())
+            return (True,r.groups()[0:i+1])
     return (False,None)
 def find_acl_shortcut(xpath):
     for shortcut in vars.acl_shortcuts:
         l = build_exp_re(vars.acl_shortcuts[shortcut])
         (ec,spec_l) = match_acl_shortcut(xpath,l)
         if ec:
             return (shortcut,spec_l)
     return (None,None)
 def acl_spec_format(xml_spec,v):
     key_f = cli_display.keyword(vars.acl_spec_map[xml_spec])
     if xml_spec == "xpath":
         (shortcut,spec_l) = find_acl_shortcut(v)
         if shortcut:
             key_f = cli_display.keyword(shortcut)
             v_f = ':'.join([cli_display.attr_value(x) for x in spec_l])
         else:
             v_f = '"%s"' % cli_display.attr_value(v)
     elif xml_spec == "ref":
         v_f = '%s' % cli_display.attr_value(v)
     else: # tag and attribute
         v_f = '%s' % cli_display.attr_value(v)
     return v_f and '%s:%s' % (key_f,v_f) or key_f
 def cli_acl_rule(node,format = 1):
     l = []
     acl_rule_name = node.tagName
     l.append(cli_display.keyword(acl_rule_name))
     for xml_spec in vars.acl_spec_map:
         v = node.getAttribute(xml_spec)
         if v:
             l.append(acl_spec_format(xml_spec,v))
     return ' '.join(l)
 def cli_acl_roleref(node,format = 1):
     l = []
     l.append(cli_display.keyword("role"))
     l.append(":")
     l.append(cli_display.attr_value(node.getAttribute("id")))
     return ''.join(l)
 #
 ################################################################
 
 vars = Vars.getInstance()
 cli_display = CliDisplay.getInstance()
 
 # vim:ts=4:sw=4:et:
diff --git a/shell/modules/vars.py.in b/shell/modules/vars.py.in
index fb53432f8e..09a5385190 100644
--- a/shell/modules/vars.py.in
+++ b/shell/modules/vars.py.in
@@ -1,184 +1,184 @@
 # Copyright (C) 2008 Dejan Muhamedagic <dmuhamedagic@suse.de>
 # 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation; either
 # version 2.1 of the License, or (at your option) any later version.
 # 
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
 import os
 from singletonmixin import Singleton
 from utils import gethomedir
 
 class Vars(Singleton):
     cib_cli_map = {
     "node": "node",
     "primitive": "primitive",
     "group": "group",
     "clone": "clone",
     "master": "ms",
     "rsc_location": "location",
     "rsc_colocation": "colocation",
     "rsc_order": "order",
     "cluster_property_set": "property",
     "rsc_defaults": "rsc_defaults",
     "op_defaults": "op_defaults",
     "acl_user": "user",
     "acl_role": "role",
     }
     container_tags = ("group", "clone", "ms", "master")
     clonems_tags = ("clone", "ms", "master")
     resource_tags = ("primitive","group","clone","ms","master")
     constraint_tags = ("rsc_location","rsc_colocation","rsc_order")
     constraint_rsc_refs = ("rsc","with-rsc","first","then")
     children_tags = ("group", "primitive")
     nvpairs_tags = ("meta_attributes", "instance_attributes", "utilization")
     defaults_tags = ("rsc_defaults","op_defaults")
     resource_cli_names = ("primitive","group","clone","ms","master")
     constraint_cli_names = ("location","colocation","collocation","order")
     nvset_cli_names = ("property","rsc_defaults","op_defaults")
     op_cli_names = ("monitor", "start", "stop", "migrate_to", "migrate_from","promote","demote","notify")
     ra_operations = ("probe", "monitor", "start", "stop",
        "promote", "demote", "notify", "migrate_to", "migrate_from")
     subpfx_list = {
         "instance_attributes": "instance_attributes",
         "meta_attributes": "meta_attributes",
         "utilization": "utilization",
         "operations": "ops",
         "rule": "rule",
         "expression": "expression",
         "date_expression": "expression",
         "duration": "duration",
         "date_spec": "date_spec",
         "read": "read",
         "write": "write",
         "deny": "deny",
     }
     acl_rule_names = ("read","write","deny")
     acl_spec_map = {
         "xpath": "xpath",
         "ref": "ref",
         "tag": "tag",
         "attribute": "attribute",
     }
     acl_shortcuts = {
         "meta":
             (r"//primitive\[@id='@@'\]/meta_attributes",r"/nvpair\[@name='@@'\]"),
         "params":
             (r"//primitive\[@id='@@'\]/instance_attributes",r"/nvpair\[@name='@@'\]"),
         "utilization":
             (r"//primitive\[@id='@@'\]/utilization",),
         "location":
-            (r"//rsc_location\[@rsc='@@'\]",),
+            (r"//rsc_location\[@id='cli-prefer-@@' and @rsc='@@'\]",),
         "property":
             (r"//crm_config/cluster_property_set",r"/nvpair\[@name='@@'\]"),
         "nodeattr":
             (r"//nodes/node/instance_attributes",r"/nvpair\[@name='@@'\]"),
         "nodeutil":
             (r"//nodes/node/utilization",r"\[@uname='@@'\]"),
         "node":
             (r"//nodes/node",r"\[@uname='@@'\]"),
         "status":
             (r"/cib/status",),
     }
     lrm_exit_codes = {
         "success": "0",
         "unknown": "1",
         "args": "2",
         "unimplemented": "3",
         "perm": "4",
         "installed": "5",
         "configured": "6",
         "not_running": "7",
         "master": "8",
         "failed_master": "9",
     }
     lrm_status_codes = {
         "pending": "-1",
         "done": "0",
         "cancelled": "1",
         "timeout": "2",
         "notsupported": "3",
         "error": "4",
     }
     node_states = ("online", "offline", "unclean")
     precious_attrs = ("id-ref",)
     time_op_attrs = ("timeout",)
     req_op_attributes = ("name", "id")
     op_attributes = (
         "interval", "timeout", "requires", "enabled", "role",
         "on-fail", "start-delay", "interval-origin",
         "record-pending", "description",
     )
     rsc_meta_attributes = (
         "allow-migrate", "is-managed", "interval-origin",
         "migration-threshold", "priority", "multiple-active",
         "failure-timeout", "resource-stickiness", "target-role",
         "restart-type", "description",
     )
     clone_meta_attributes = (
         "ordered", "notify", "interleave", "globally-unique",
         "clone-max", "clone-node-max", "clone-state", "description",
     )
     ms_meta_attributes = (
         "master-max", "master-node-max", "description",
     )
     score_types = {'advisory': '0','mandatory': 'INFINITY'}
     boolean_ops = ('or','and')
     binary_ops = ('lt','gt','lte','gte','eq','ne')
     binary_types = ('string' , 'version' , 'number')
     unary_ops = ('defined','not_defined')
     simple_date_ops = ('lt','gt')
     date_ops = ('lt','gt','in_range','date_spec')
     date_spec_names = '''hours monthdays weekdays yearsdays months \
         weeks years weekyears moon'''.split()
     in_range_attrs = ('start','end')
     roles_names = ('Stopped', 'Started', 'Master', 'Slave')
     actions_names = ( 'start', 'promote', 'demote', 'stop')
     node_default_type = "normal"
     node_attributes_keyw = ("attributes","utilization")
     shadow_envvar = "CIB_shadow"
 
     prompt = ''
     tmpfiles = []
     this_node = os.uname()[1]
     cib_in_use = os.getenv(shadow_envvar)
     homedir = gethomedir()
     if not homedir:
         hist_file = ''
     else:
         hist_file = os.path.join(homedir,".crm_history")
     rc_file = os.path.join(homedir,".crm.rc")
     tmpl_conf_dir = os.path.join(homedir,".crmconf")
     tmpl_dir = "@datadir@/@PACKAGE@/templates"
     pe_dir = "@PE_STATE_DIR@"
     crm_conf_dir = "@CRM_CONFIG_DIR@"
     crm_daemon_dir = "@CRM_DAEMON_DIR@"
     crm_daemon_user = "@CRM_DAEMON_USER@"
     crm_version = "@VERSION@ (Build @BUILD_VERSION@)"
 
     ra_if = None # class interface to RA
     stonithd_metadata = None # stonithd meta data
     pe_metadata = None # PE meta data
     crmd_metadata = None # crmd meta data
     cib_metadata = None # cib meta data
     crm_properties_metadata = None # PE + crmd + cib meta data
     meta_progs = ("crmd","pengine","stonithd","cib")
     crmd_advanced = (
         "dc-version",
         "cluster-infrastructure",
         "crmd-integration-timeout",
         "crmd-finalization-timeout",
         "expected-quorum-votes",
     )
 
 # vim:ts=4:sw=4:et: