Fixed bugs and added reverse lookup to return correct values for getAll.