Updated couple of bugs after removing search id field