fix L5 breaking changes on view errors
fix L5 breaking changes on pagination