Fix bug around lexer to detect
Also deal Entry#short_body, Use around alias