Updated full search to include ID and status