improvements for swift quota setting

Change-Id: I8399abcd1788ca9d0aeb6fed7030959186d9664e