Search for "@" not "$att" and shorten a syntax

TODO: Perhaps try to run the macros one step earlier