Fixed drafting issue from name on search