Fixes to ES retrieval.

Also fix admin jsp so it works with new refactored config.