Check for Token not being null
EPiServer Search disabled attribute removed, not necessary
Some refactorings
Some refactorings