Added additional circle colors, cleaned up some code in queries