Add query criteria helper functions on query object
Use criteria helper function
Include upcoming approved as data to form
Display approval queue when not empty