DSS-5411

Query changed to generic, add share id logic.

3/6/2014 07:41 PM

Signed-off-by: MikalaiSivokha <nickolay.sivokho@gmail.com>