filter for active lines + changes to master