DoP adjustment for small queries. Rework

Change-Id: Idd70130ca07dc4c82eb2a83422093789fd510c81
Merge "DoP adjustment for small queries. Rework"