Updated forms for new (more accurate fields names) also updated queries to match.