DS-1974 Fixed bugs related to setting default filter queries

This PR fixes the bugs reported in DS-1974.