changes to make the user location indexing work for once, dammit!