First request is not returning the whole object, so second one have to be done.

In some places redo a logic a bit in order to follow new way of slap library
usage.