+ further bugfix for current_queue relation