fix search-reset and remove reduntant activate

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
[ci skip]
merged with another wave of ember-model (ca054a63b0acba037a0ac0d02c89813a5db2a0b4) [deploy]

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>