Added enrollment query and person query menus