Now support multiple rows on join
UI error messages improved