Removed some form fields, adjusted the completed check query.