Beyond compulsory schooling options and changes in upper secondary education