bugid-100154 | WAM index change bugfix