Simplify logic for fid in search box check
Add comment to fid in search box check