Repair some bugs and create new join tables view