Fixed template filtering
Added Better link handling