Filter out empty lines
Tweak origin line regex