WIP on short loan requests support