Fixes for searching in alias and broken alignment