Fix for searching fields