Rework extract_views to fix mmathing issues created by commas