Fix bug #1997 - Found the issue elsewhere also, so I fixed them too.#2004

mrl22 wants to merge 2 commits intorappasoft:developmentrappasoft/laravel-livewire-tables:developmentfrom

mrl22:mastermrl22/laravel-livewire-tables:masterCopy head branch name to clipboard