added handling for aircraft/zeppelin rbtns and custom start EPs