Fixed issue with building multi part expressions, fixed issue with handling unary expressions