Fix: issues raised during review (latest API / lines swap)

1 job for record-as-feature in 11 minutes and 26 seconds (queued for 1 minute and 21 seconds)