Update to the support for expressions

Signed-off-by: Robin Smith <robin.smith@clicktravel.com>