range_key with GSI fixes