OOIION-869: Enhanced UNS find_events and polished