start refactor query screens