cleanup and fixing spAdmin link tags