(Issue 3572) Network and search macro implementations