Better active session line handling