Updated selection tools to handle missing rows.