Standardize indexed names using the PropertyIndex class.

Update ES mapping to match.

Implement sort of results