Rearranges some variables and restrict link to title
Simplifies limit variable