Some more work on elasticsearch