entitlement: fix ordering in specific scenarii

This closes #147 and #148.

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>