changed indexing to common index and added _account field