rebuilt query builder, new icon, included select by expression