LPS-46102 Preserve all parameters rather than only entryClassNames (Minhchau's fix)