cleaned up fixes and restored total search rankings

author: nhhughes