UICM-5: Update js navigator tool to support skip logic