Clean up to view id parsing and small fixes thanks for Haruna and Ind.