Reverted Contact search
PR fixes