Browsing: golf fixes