EA-31: Peformance Improvements for Awaiting Admission Query