Added part value searching