The national assembly will undertake a comprehensive amendment of the land law at its year-end session to address shortcomings identified after nearly two years of implementation and to align with the two-tier local government model.