Removed secondary index and updated data selecting to be a filtered scan