fix structure
fix queries