Fix action list and if-else