Fix Grid filter and pagination options