Queries and form fixes.