Fix issue with external linking, fix pagination issue when grid not visible