Cleaning up more json stuff, so far works with search box and recent still