Shared Search Fix