Replace queries by calls to FindCategory and FindPart