Fixed warning
Fixed loading wrong object
Cleaned up default action selection