diff --git a/resources/template-functions.json b/resources/template-functions.json
index cf858c7691..7656db4021 100644
--- a/resources/template-functions.json
+++ b/resources/template-functions.json
@@ -3,10 +3,12 @@
     "divide": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x / y)\n", 
     "uppercase": "def evaluate(self, formatter, kwargs, mi, locals, val):\n    return val.upper()\n", 
     "strcat": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    res = ''\n    for i in range(0, len(args)):\n        res += args[i]\n    return res\n", 
+    "in_list": "def evaluate(self, formatter, kwargs, mi, locals, val, sep, pat, fv, nfv):\n    l = [v.strip() for v in val.split(sep) if v.strip()]\n    for v in l:\n        if re.search(pat, v):\n            return fv\n    return nfv\n", 
     "substr": "def evaluate(self, formatter, kwargs, mi, locals, str_, start_, end_):\n    return str_[int(start_): len(str_) if int(end_) == 0 else int(end_)]\n", 
     "ifempty": "def evaluate(self, formatter, kwargs, mi, locals, val, value_if_empty):\n    if val:\n        return val\n    else:\n        return value_if_empty\n", 
     "booksize": "def evaluate(self, formatter, kwargs, mi, locals):\n    if mi.book_size is not None:\n        try:\n            return str(mi.book_size)\n        except:\n            pass\n    return ''\n", 
     "select": "def evaluate(self, formatter, kwargs, mi, locals, val, key):\n    if not val:\n        return ''\n    vals = [v.strip() for v in val.split(',')]\n    for v in vals:\n        if v.startswith(key+':'):\n            return v[len(key)+1:]\n    return ''\n", 
+    "first_non_empty": "def evaluate(self, formatter, kwargs, mi, locals, *args):\n    i = 0\n    while i < len(args):\n        if args[i]:\n            return args[i]\n        i += 1\n    return ''\n", 
     "field": "def evaluate(self, formatter, kwargs, mi, locals, name):\n    return formatter.get_value(name, [], kwargs)\n", 
     "subtract": "def evaluate(self, formatter, kwargs, mi, locals, x, y):\n    x = float(x if x else 0)\n    y = float(y if y else 0)\n    return unicode(x - y)\n", 
     "list_item": "def evaluate(self, formatter, kwargs, mi, locals, val, index, sep):\n    if not val:\n        return ''\n    index = int(index)\n    val = val.split(sep)\n    try:\n        return val[index]\n    except:\n        return ''\n", 
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index 1e7a62b869..9e58d4f638 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -356,7 +356,7 @@ class PostInstall:
                     mimetypes = set([])
                     for x in all_input_formats():
                         mt = guess_type('dummy.'+x)[0]
-                        if mt and 'chemical' not in mt:
+                        if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
                             mimetypes.add(mt)
 
                     def write_mimetypes(f):
@@ -376,11 +376,10 @@ class PostInstall:
                     des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
                             'calibre-ebook-viewer.desktop')
                     for x in des:
-                        cmd = ['xdg-desktop-menu', 'install', './'+x]
-                        if x != des[-1]:
-                            cmd.insert(2, '--noupdate')
+                        cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
                         check_call(' '.join(cmd), shell=True)
                         self.menu_resources.append(x)
+                    check_call(['xdg-desktop-menu', 'forceupdate'])
                     f = open('calibre-mimetypes', 'wb')
                     f.write(MIME)
                     f.close()