Clean up end spaces.
Add additional entry point url parameters.