Fixes in query builder paths