Temporary fix to keep app working. Reworking entire router at the moment