Adds minor handling refactors for sub-request - needs revisiting