Fixes for AWM searching