change way we query server for fixing