Fix the way we get fields from the page