Added uniqname and umid to function so those parameters are searched as well. Cleaned up code spacing. Added other elements to search form - they aren't taken into account however