Fixed query for saved forms