Merged DATACASS-62
DATACASS-64 : DONE : Removed old QueryOptions Map.