aa: Skip if header not found
habervaktim: Refactor and fix formatting