Improved location handling

* Added restrictions on location format
* Improved location guessing for entities
Adding locations to plain entity renderings