Use entities for less-than
Restore default target links