rhbz882770 - escape _ in query
minor ui change