Push switch conditions/tasks

I could indeed return a different data format depending on the type/value, but I'm also using that condition to change the shortname. Not a big deal, let me know if I still should move that code :+1: