Respect the flat attribute when tagging/untagging
Fix buglet in filter/move