File name should have changed during query->selector rename. Also, make selector parsing deterministic.