Search Changes 7 - Some small changes

See commit log for details