Sort out blocklinks

Mods were being shown blocklinks in some cases when they shouldn't be

Also reduce poll time

Change-Id: Ic9bb65955e327a55cc03d89da3a47dcbf8f7557b