Fixed issue with HTML entities in expressions