[v0.5.4.2] [Refactoring] Fixed symbol references finding