working
fix unjoin links
fix query