Tweak to SQL query builder section

Tweak to SQL query builder section.