Fixed drill down functionality but introduced new bug. The rest is ready for today's demo.