ETag working partially
some microfix