#DCMEEREQ-69 refactor query and retrieve timezone support

enhanced code structure