adding basic AVET indexing
fixing incosistencies bug in AVET