Display query screen bug fix