Fix get entity usage index function in client store

Change-Id: Iecad3712fa85248f818451961af8606e8459bdc9