Added ability to search UDT's.