improve findById and findRowById performance