Fix spotlight links , closes #805 #806  #807 #808