#22 and added queue selection in RP config