Fixed server error bug and added controlled vocab to forms

Fixed the bug that was causing server errors on queries with no results, and changed the forms to use controlled vocab whenever possible.