fix queries, add content