Fixing temporary logic a bit, now the app functions again as normal

I still need to implement the new API changes though, but at least for
now I can continue working on my screens uninterrupted.