Correct context and add some properties to context.

See #4. I also adjusted the geo coordinate terms to work with Elasticsearch geo queries.