Replace some functions with tags

Some of the simplistic functions are just toggles that can be managed as
tags