Categories: replaced stupid path fetching with smarter one