Minor improvements on ar querying.
Turn infra emphasis off.