Updated form_internals to use multi_queries