Improve system folders detection