try to handle switch case indentation
more robust code for navigation + basic filling compatibility