Add code to Search View & fixed up some trailing commas