Added waitForPage with using primary fields by default