[Refactoring] Fixed references finder