Student form finder updates

https://www.pivotaltracker.com/story/show/57810472