Fix update queries. Place some comments regarding future work.