Updated Fetch and Search