fixes, some support for Laravel's query builder