Fixed queue fields. Fixed queue to_json