Determine the correct target before onFilter

Fix #156 and also returning correct indexes if a drag handle is present (#154).