fixing local store parsing logic