fix and improve long row targeting