Fixed #2 issue. For now both requests are unite to one general.