updated fieldselect and fixed search