Improved handling between requests with sessions, moved queries to choices option so that data can be defaulted.