Fixed bugs related to setting default filter queries
Merge pull request #521 from zuki/DS-1974

DS-1974 Fixed bugs related to setting default filter queries