bugid-100154 | WAM index bugfix