[code] add content to query, clean some shit