Attempt to fix suggestion performance problems with large dbs
Minor performance tweak attempts