added better hollis id handling