Improved parsing section of execution page