Moved comment
Add subdelimiter on location_type and accordingly fix tests
Update autocomplete
Merge branch 'public' into 3000