search fixes
changed search tokens model