[TAC-150] some improvments - use defined queue names