This should make the frontend much easier to handle than before. It isn't the best solution, but it makes it easier in the frontend for now.