Search Changes 13 - Final changes