How to restrict grade list based on job?

Hi All,

When we are creating a job requisition or creating an offer, we are seeing entire list of grades rather than only valid grades associated with the job.

This is working fine everywhere else except on these two pages.

Is there any way we can make it work for these pages too?

Thanks