data: Queue was being overriden when an autoretrieve condition was set
Merge branch 'master' into develop
Bugfix: Aliases list was getting extended everytime