Apply workaround for sorting
Fix grid view