small imprav on client requests