Fixes for vendor user id & added new data store indexes.