added json + routing fix