Added full table queries and colors