Adds sorting to entrypoint lookup resource.
Merge "Adds sorting to entrypoint lookup resource."