Fixes : #6056 - Refactored the logic to get order by query variables for field types - Added a case for Currency field type