fixed regex
fixed oneTrough and manyTrough join