Fixed query-builder to manager-utils