Fixed incorrect marker location #310
Updated expression validation rule #133