Add more logging
Change element name identifying a MAB record

* Add test