refactor tracking

allow search events, better logging + no reference to eVars or props!