fix main page, add queries