SSP-2180 , SSP-2181 - fix query after change in constructor