Do not add selections as mainlines for headers
Fix for new remote callbacks API