updated/fixed search form