Fixed users indexing