make improvements especiall on queries performed, and enable queuing og /gw requests