#2350591 Expand comments and query cleanup.