fix querying based on gecko 17+ changes