Do not warn for static surfaces
Add support for manual tagging mode