ARNM-5: Some queries optimizations.