[viewster] Improve extraction