Added better lookup method when selecting lookup type.