Better formatting for CBD/non-CBD queries