Fixed bad parsing of queue venrts
Removed stupid isinstance(dict) hacks
Fixes